Make this work properly for the root window.

2007-06-30  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_get_origin): Make
	this work properly for the root window.

svn path=/trunk/; revision=18311

diff --git a/ChangeLog b/ChangeLog
index 2ca0272f8b3a859176f983c4d53fd3f41eb9404c..ccf524f2f2f23cd8d5d05a9663e19d01ac245e8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+2007-06-30  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/gdkwindow-quartz.c: (gdk_window_get_origin): Make
+       this work properly for the root window.
+
 2007-06-30  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/GdkQuartzView.c: Improve the tracking rect updating:
        - No need to override setFrame.
-       - Use our own size instead of the bounds from for the view as it's
-       not always updated before the tracking rect.
+       - Use our own size instead of the bounds from the view as it's not
+       always updated before the tracking rect.
        - Only reset the tracking rect if the new window is nil).
        
        * gdk/quartz/GdkQuartzWindow.c: Update the bounds of the content

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index a4e62fa929dcfb558ee0c1b2868f0b8f35dc2c8a..d2e1f6aff90a7719d728909d82ec5ac63a22608f 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1208,6 +1208,13 @@ gdk_window_get_origin (GdkWindow *window,
       
       return FALSE;
     }
+
+  if (window == _gdk_root)
+    {
+      *x = 0;
+      *y = 0;
+      return TRUE;
+    }
   
   private = GDK_WINDOW_OBJECT (window);